diff --git a/system/core/Common.php b/system/core/Common.php
index 93f0f0a..ec44ea8 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -700,11 +700,17 @@
 	{
 		$double_encode = (bool) $double_encode;
 
-		return is_array($var)
-			? ($double_encode === FALSE
-				? array_map('html_escape', $var, array_fill(0, count($var), FALSE))
-				: array_map('html_escape', $var))
-			: htmlspecialchars($var, ENT_QUOTES, config_item('charset'), $double_encode);
+		if (is_array($var))
+		{
+			if ($double_encode)
+			{
+				return array_map('html_escape', $var);
+			}
+
+			return array_map('html_escape', $var, array_fill(0, count($var), FALSE));
+		}
+
+		return htmlspecialchars($var, ENT_QUOTES, config_item('charset'), $double_encode);
 	}
 }